dgit.raspbian.org Git - emacs.git/commit

projects / emacs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0b59090 2e7a189)

author	Glenn Morris <rgm@gnu.org>
	Sun, 13 Jan 2013 20:03:01 +0000 (12:03 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 13 Jan 2013 20:03:01 +0000 (12:03 -0800)
commit	c0511b57692c7a27d3632c34653dab5cfed629ef
tree	6e3772eda7ab9082fe5b1639746040ac6cd666a0	tree \| snapshot
parent	0b59090ba3d9b9e3d96d3e80d7031dc46bc2d134	commit \| diff
parent	2e7a1892492d450d1fdf52cc704dd8f5d3a9cb18	commit \| diff

Merge from emacs-24; up to 2012-12-10T20:27:33Z!eggert@cs.ucla.edu

ChangeLog	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/org/ChangeLog	diff1 \|	diff2 \|	blob \| history
lisp/progmodes/python.el	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	diff1 \|	diff2 \|	blob \| history
src/emacs.c	diff1 \|	diff2 \|	blob \| history
src/nsfont.m	diff1 \|	diff2 \|	blob \| history
src/sysdep.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.